Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

Labelling this PR as size/XS

This is effectively a cherrypick of #16189.

Thanks.

LGTM.

@k8s-bot ok to test

pr builder appears to be missing, activating due to 'lgtm' label.

Continuous integration appears to have missed, closing and re-opening to trigger it

The author of this PR is not in the whitelist for merge, can one of the admins add the 'ok-to-merge' label?

GCE e2e build/test failed for commit 829f7f6.

• Build Log
• Test Artifacts
• Internal Jenkins Results

@k8s-bot test this please

GCE e2e test build/test passed for commit 829f7f6.

• Build Log
• Test Artifacts
• Internal Jenkins Results

Automatic merge from submit-queue